merge trunk
authorKenichi Handa <handa@etlken>
Fri, 14 May 2010 04:15:58 +0000 (13:15 +0900)
committerKenichi Handa <handa@etlken>
Fri, 14 May 2010 04:15:58 +0000 (13:15 +0900)
commit9611d5dfea9fa8356f9b5c597a2d6122858efe25
tree98c236a8e9235c3f847eae4eac90d81723e408db
parent0a5fb99be2baeec1e09d56642fb41bbc4766369e
parent2e8a7e93d14e9cee0e45e23a05bc6cb10f02e5bb
merge trunk
src/ChangeLog
src/xdisp.c